Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <[email protected]>
Tue, 10 Aug 2010 21:03:15 +0000 (23:03 +0200)
committerWolfgang Denk <[email protected]>
Tue, 10 Aug 2010 21:03:15 +0000 (23:03 +0200)

Trivial merge